From ba09136429651bc36a3072a1f23c4a434ecfa88f Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Tue, 28 Feb 2006 12:43:08 -0700 Subject: [PATCH] [IA64] xen_timer_interval removed (was not used). Signed-off-by: Tristan Gingold --- xen/arch/ia64/xen/vcpu.c | 15 +++------------ xen/include/asm-ia64/domain.h | 1 - 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c index b5f5043786..027e54f3ca 100644 --- a/xen/arch/ia64/xen/vcpu.c +++ b/xen/arch/ia64/xen/vcpu.c @@ -985,15 +985,6 @@ IA64FAULT vcpu_set_lrr1(VCPU *vcpu, UINT64 val) return (IA64_NO_FAULT); } -// parameter is a time interval specified in cycles -void vcpu_enable_timer(VCPU *vcpu,UINT64 cycles) -{ - PSCBX(vcpu,xen_timer_interval) = cycles; - vcpu_set_next_timer(vcpu); - printf("vcpu_enable_timer: interval set to %lu cycles\n", - PSCBX(vcpu,xen_timer_interval)); -} - IA64FAULT vcpu_set_itv(VCPU *vcpu, UINT64 val) { //extern unsigned long privop_trace; @@ -1001,10 +992,11 @@ IA64FAULT vcpu_set_itv(VCPU *vcpu, UINT64 val) if (val & 0xef00) return (IA64_ILLOP_FAULT); PSCB(vcpu,itv) = val; if (val & 0x10000) { -printf("**** vcpu_set_itv(%lu): vitm=%lx, setting to 0\n",val,PSCBX(vcpu,domain_itm)); + printf("**** vcpu_set_itv(%lu): vitm=%lx, setting to 0\n", + val,PSCBX(vcpu,domain_itm)); PSCBX(vcpu,domain_itm) = 0; } - else vcpu_enable_timer(vcpu,1000000L); + else vcpu_set_next_timer(vcpu); return (IA64_NO_FAULT); } @@ -1086,7 +1078,6 @@ void vcpu_set_next_timer(VCPU *vcpu) //UINT64 s = PSCBX(vcpu,xen_itm); UINT64 s = local_cpu_data->itm_next; UINT64 now = ia64_get_itc(); - //UINT64 interval = PSCBX(vcpu,xen_timer_interval); /* gloss over the wraparound problem for now... we know it exists * but it doesn't matter right now */ diff --git a/xen/include/asm-ia64/domain.h b/xen/include/asm-ia64/domain.h index aa59600906..5846231967 100644 --- a/xen/include/asm-ia64/domain.h +++ b/xen/include/asm-ia64/domain.h @@ -59,7 +59,6 @@ struct arch_vcpu { unsigned long domain_itm; unsigned long domain_itm_last; unsigned long xen_itm; - unsigned long xen_timer_interval; #endif mapped_regs_t *privregs; /* save the state of vcpu */ unsigned long metaphysical_rr0; // from arch_domain (so is pinned) -- 2.30.2